]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
build: Workaround quoting issues in configure script
authorAlexander Tsoy <alexander@tsoy.me>
Mon, 27 Oct 2014 13:45:10 +0000 (16:45 +0300)
committerBastien Nocera <hadess@hadess.net>
Fri, 7 Nov 2014 09:10:41 +0000 (10:10 +0100)
Default value of BROWSER_PLUGIN_DIR variable contains special symbols.
Thus quoting and inlining it in parameter expansion is not portable.
In particular it does not work in dash. Replace ${a:-b} parameter
expansion with conditional statement.

https://bugzilla.gnome.org/show_bug.cgi?id=739241

configure.ac

index d55848b7b8f8515010247c7b2f26add434103872..5b8c306ba2479c878955fa53a72ce8c7fb2c13a6 100644 (file)
@@ -232,7 +232,9 @@ esac
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
-BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
+if test -z "${BROWSER_PLUGIN_DIR}"; then
+  BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
+fi
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
 
 AC_CONFIG_FILES([